fix map method