applying our local changes done in this gem