Re #431 small tweaking.