Yang/patcher fix