Fix controller case