This addresses #1