Fix for Wrong calc