FW-512. change target place