Fixes nathanmarz/storm#358