get rid of bad map() calls