Resolves Issue 154