minor changes based on PR#417