Resolves Issue #85

Suggested fix to resolve issue Issue #85