Make extra args pass to map correctly