sp-v2-21 #542