trying to fix bugs for CI