Implemented code fix for base references