fix for issue #2535