Fix horizontal drag problems for issue #20