Yet another pull request to fix @Camwyn's merge request