handle another case and fix another bug