Fixed yaml load issues

check dis