Fixed issue with broken references.