Proper control handling