Fixing #29