Fixes issue #583

Respond to code review feedback
Merge conflicts