Further improved by [a3e4eb41e0b87f34].