Return fire to old code