Workaround for tst bug