Removed duplicate check introduced in the last change