Fixed attachment-after
Cleanup