apply missing patch from google code repo to resolve Issue #17