Added NXIDE-342 workaround, updated code presentation