fix for issue #1380