this addresses #405