Fix to Storm v0.8.2