Improve #252 a little