Minor improvement for last commit