Fixes #297 (finally)