Order problem fixed