Fixes a bug from last commit