Real fix for #444 with passing test