Rearranging to prevent errors