For #255 another attempt at solving the CI mapping issue