Fixed some restrictions ordering