Limit class curve to class (take 2)