better handling of non default controls