Fix bug at new address