Add additional check