Further Resolves Issue #211