Partially address #62