Remove @ (avoidance of error); make more strict