Fixing a bug that crept back in somehow...