Small fix after testing on real data