Caries a problem vis-a-vis Windows, just like previous commit, but that can be fixed later on. Closes #866