rewriting features, discovering new bug, ref #19