Bug fix ... yet another --kazu