move the moved call to the right place...