bugfix milestone 2