hacky fix for v0.10