Fix #4867 (updated; corrects address calculation)