fix for issue #2913