Fix a minor bug on lab/20140917.