Lee Machin Fixes #1