Fix bug #28

For GCI task http://google-melange.appspot.com/gci/task/view/google/gci2013/6634808570544128