Fix problem with #controls