Fixing #244