Fix bug from prev commit