fix #224 part two