Bug fix for control loading