[#51402935] Calculate Fix