Fix Issue 1649