fixing issue #1 for other controllers