tweaking #1363