3.7.0: Fixes #13