Fix a minor problem with earlier #1 fix