Better ASDF3 fix