Fix Issue 2