fix calculations 2