Trying to address #542

Closes #542; see discussion on the issue for further detail.