NEXUS-5567: Fix for issue and similar cases

Like scripting with partial message.