Fix for broken AQ/DE