Fixed controller behavior