bugfix 2.0.2 commit