Bug fix in order