Fixes #161
Fix for runtime error when using fire extinguisher.
Fixes #101
Fixes #61