Haba patch in branch 1.5.