Fixed recursive map arguments