Apply fix which is not yet in npm