Trying to address #73