fixed yorc issue