A better solution for the last change: