Fix for AA conversion