fix the same function