fixed commit join stuff