Fixed minor bug from last commit