Fixed controller bug, and vector bug