Use map rather than mapValues to avoid unknown lazy behavior