also needed as fix for #1728.