Fix up for 1.0. Fixes #309