Work on CI server problem