initial commit fix #2