Fixed a bug with WH-movement