Again fixed AMS calc