Fixes Mail Merge issues