Improve commit cf37a50