Fix minor bug from prev commit