Fixed some hardcode