FIX Fixes #965. Needs framework PR #2945.