Added fix to theses controler