Fixes #66 (most of the time)