2.0.4 bugfix