Fixed controller references