Double adding of screens removed