Fix calculation?