Bug fix for the the controller handler.