Improve fix #2204