Fixing a bug! --kazu