Hopefully this is a real fix for #2