Applied patch #2. Second try - to my branch.