Merge fix for @Camwyn's pull request