Fixes #351 for 2.0 release.