#JC-1322 a little fix