Bugfix self reference