ADD - Bug fix on model