Fixed "Controller lock" issue