fix #279 part two