correctly implement spec §5.1.1! #1161