One more improvement to the previous commit