Trying to fix Controller