First commit for https://github.com/wuic/wuic/issues/135 and with workaround until https://github.com/wuic/wuic/issues/133 is fixed.