Fixing data calculation