* forward ported right axis patch from 1.2 branche