Fixed GoogleCode issue 22