Fixed version of https://github.com/windup/windup/pull/290/files