observable bugfix, model change accordingly