fix fire behaviour