Fixing #20