Now the bug is really fixed
Removed self-references