Model: Janchas fix moved to normalize method