Fix issue with script builder

Change-Id: I9852a8fe9e549074c3d4742f33dd219c5ece5937