add all for issue #2