Fixes issues https://github.com/wuic/wuic/issues/100 and https://github.com/wuic/wuic/issues/115