Fixes for getWrap: solve issue #194