Fixing #219