Fix issue in mapping module