Fixed problem with save issues without attachment