Prevent spontaneous fitting

Fixes #1065