Merge pull request #619 from DavidS/fix