Fix  issue #2126