Fix for inconsistent checks bug