fixed firing issues