Fix Some controllers bug