Improve Fixes #1617