Bundle fix for windows and otherwise