Move target call to the right place (too late to work)