This is the real fix for #3