Fix the #6 fix