Fixed GLL fields as per #3