Fix Issue #1,#2