Per feedback on fire layers issue #39