Fixed useless calcs