Applying JS-200 patch

Applying Martin's patch. Sorry was JS-200 not 194