Improve #976