fix haiku
conflict fix
conflict fix
haiku
Merge pull request #29 from joanneci/19986

19986