Bugfix: Model class