Fixed silly bugs in 265a544737f9aea048eaa3e5b7fd2f55991d089a

Change-Id: Iea30e7188e06c641706e46b3f1a9695cc223141a