Fix for skipping proper order