Closure#2048

Based on the correction of cc#1893 corrected by pull request #123.