Fix merge error.
Merge pull request #222 from TomFischer/BugFixMaster

Fix merge error.