rc0.9 bugfix