removed unnecessary conditional