Fixing #228