Check for attachment flag when saving as well