fix water_commit_is_flat list index out range