fixing some restrictions