fixed issue with maps, also deferred must always be the first param!