updated to address #831

fixes #831