Partially address #66