Add print enhancement (issue 2287)