Bug fixed in the controller