Fix Issue 1570