rebuild for pull #38 @josso