Model constructor fix