Improved handling of calculations with aces