Fix bug in previous fix.

3 files changed