Fixed calculations again