Fixed bug from last change