Graham - Fixes #517