Fixed bug with locking controls