First attempt to solve model issue