this partially addresses #236