addresses #168