Making address a soft parameter (fix)