Fix #1699 - Double free with `aa`