Bugfix: NULL move