fixed commit issues