fixes google code issue 1330