Fixed a new bug from last update