Fix control (8/20)

Fix control