Fix Issue 41