layout file loading fix
Merge pull request #586 from Zolmeister/layoutFix

layout file loading fix