updated to fix #1941