Fixes #199 (finally)