#340: Faster calculation