Fixed primary constructor treatment