The previous fix didn't take into account all the possibilities.  This should.