Added fix for : https://github.com/windup/windup/issues/5