Resolves Issue #222'