Fix for 8192

This fixes #8192.