fixed controller events