fix unused code #20