Fixed builder-enter + builder-leave to allow image inheritance