updated for issue #2