Fixed remove_attachment