Bug fix for v0.41