Using suggestion from upstream to resolve the "`" loop issue