FW-512. fix target