add additional check