Works controller bug fix