Fixed #JC-1339: