Bug fix - adds reference to self