Fixed serious issue with "model" type