Fix 1976

fixes #1976 and #1957