fix for issue #687