Fixes 2.0.0 crash bug