remove old fix. add the fix from master branch