HSV support for #1143, not quite working right