adding error-prone support