Control Loaded handler bug fix