Closes #194 for realsies and fixes bug introduced as part of 9d1c5bf549