Lifted bug in script handling