SSP-1102 fixed event firing issues.