Finish bugfix