bugfix: fixed the new bug from fixing the old bug