Bug fix from Scott Baker