Remove last attachment fix