solve issue #2 and #3