Fixes #264