bugFix and using right schema location now