first commit fixed