Fix the great to-fix lockup of 9/30/14