Add some patch on the  nathanmarz's strom