fixed lazy map