Fixed controller problem