Fixed google code Issue 233