More chasing of script move.

Ticket: #4385

Noticed by: rodrigc
Pointyhat: jpaetzel