Attempt to address #24 and #26