Even more conflicting calls fixed