use manual mapping instead of underscore, as underscore isn't working properly