Simpler fix for #80