Bug fix in model - subject