Follow up to https://github.com/code-mancers/rapidfire/pull/110/
Follow up to #110