Adapted to points fix