fixed issues with data interpolation