fix hardcode