Fixed google code Issue 234