Fixes #64

Will be pushed as 3.9.2