Band-aid patch for truly annoing asserts in shape rendering

Real fix coming tomorrow.
Merge pull request #1350 from tschneidereit/nat

Band-aid patch for truly annoing asserts in shape rendering