Fix attachment and remove unnecessary error step