Typo bugfix and attempt to resolve issue #1355