Fix #628 / Export aux encode

Relates to #628