#JC-1564 fix in preview and PM