Bug/nocontrols

Fix the bug #446