Fix Issue 96