[XACT3] Fix issue #381 and issue #369