bugfix2
Merged