Controller fix