Hopefully fixed fire issue