Fixes #263