fix to work on v0.10 branch