Fix for #880
Fix the test