Moved to value-mapper and it seems to work for locals