#683 Better code.