first commit fix now bug