try to match changes made by Ace