Fix for code.google.com #390