propagated some fixes in C_axis()