Model::small bugfix which lead to endless recursion