RINF / TRWS small bugfix