bugfix for v0.12