polishing; removing auto-reference as buggy.