Fix Issue 17