#JC-1420 preview fixed