fully fix #70