Fixed issue #2429