Tim Scott, fixes #167