updates for issue #555