Tested to 3.7.1. Fixes #86