File insensitive OSX bug
Merge branch 'hotfix/creationsbug'