Fix + tests for #5969