Fixing #254