Fix for curve types