Fixed set reference issue