[2.22](PG, GS) fixed an error, testcases work now