Modified ordering of boundary conditions