fix #212, #214