halfway fix for commit from other machine