AddScreenActivity bug fix