Fix for constructorcalls found multiple times