Order division bugs fixed