[0.6.6] fixes #21