rebuild for #630