Addresses #1