fixed commit crashes