14595 Fixed settings in controller