Some adjustment for #25