Try to fix gem issues