Controller fix

Fix need a double check