really fix #827, add @dariocravero's test