Applied patch Doshiro