Final fix for numerator