use forked gem with a fix for our case