fix 1.0.8 as we've seen bugs in production with 1.0.9