2.0.2 bugfix