fixed issues in #70