TISTUD-1439: fixed the issue Clayton saw.