Fix Issue 1561