Bug fix with black wrap mode -- wasn't actually returning right address