addresses #95