RSPL-6167 "Invalid completion" fix