Fixed a drag issue. (same as #526 but ready to merge)

Created by: Kevinrob

This PR apply #526 on the top of current master branch. The author of #526 take too much time to rebase.