Slight bug remains with address offset