Temporary Fix for controls, pending implementation of centralized function.