Fixes #48.

Change-Id: I2066aa3c0995e7ede12534b95fec5f38444fd9df
Reviewed-on: https://code-review.googlesource.com/3387


Reviewed-by: Paul Wankadia <junyer@google.com>