Fixed POI calculations