Fix Issue 1003