HSV support for #1143