Improve #5