Resolves Issue 1