minor clean up, see #603