Fixed issue with non-user control