Fix hardcoding issue