fix issues with firing