Fixing Jiang's bugs.