Added latest 1.0.0 fix