sp-v2-23 #674