fix for issue #1185