Resolves Issue #395