glg's bug fix.
gdo's bug fix.