Fixed controller locking problem