Make Fire check more efficent - by @Tschrock