xxx fix limit computation