One more improvement