also fixed map method