Consider eliminating in favor of a synchronous check