Fix the fix for #125