Added additional check