improve issue19