Fix Issue 165