closes #102 - this was originally done in prev patch