updated for issue #1