Fix for address generation fail bug