Fix Bhim's code from facebook to work with git