Fix checking issue