Solve issue #1 and #2