fixes in getControl()
Merge origin/master