Bugfix pass finish