Fix previous commit (scripting part)

Change-Id: Ib451642924909c11db4252e81d0c6db690c0e838