minor improvements for PR#18