bugfix part one