Fix 1082

Fixes #1082