Fix issue #2 of BJ's reported bugs