updated to address #831