added additional check