modification on mine
merge and fix