Fixes #267