Use map, not map! - closes #165