Fix Issue 1288.