Event based controls fixed