Better buildfix.

Fixes #1099.