Unfortunately forgot one fix for checkForwardReference in the last commit