Fixed google code Issue 232