Improve fix #2359