JLANGX-11 fix