Fixing #281