Move some logic to eliminate CLANG error