for issue #6