Test and fix for #127