Fix Issue 11
Fix Issue 12