Fix upstream issue 200