addresses #43