remove map call for 3.x compatibility