add stream/map hack