Improve #30.