attempt to address #10