removed duplicate check