WIP Controller fix