join bugfix round 2