Fix for v0.10.1