fix #25, #22