Fix control issue