Finish bugfix2