[Fixed] screenplay issues

Change-Id: Ibc96f943d5f17cc59584f4fb3452191c35f6389b