Fixing the last script calls (as this was not working any more for some
reason)