fixes for position/order