Removed unnecessary conditional