Fixes 640 - addresses placeholders disappearing