bugfix for branch 0.4.0