shrinkwrap to solve issue #617
monkey patch to temporarily avoid issue #531