Fix Master Yi q