Improves #46.