better re-configure support