horisontal mwhell support
Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172