Fix Issue 18