fixed zrt issue #76, implemented on zrt side