Tim Johnson, fixes #512