Made event firing work alright.