Improve PR#45