this partly addresses #308