replace new home and fix issue