Improves #30.