Work around recursive reference oops