Fix Issue 2 and 8