fix hardcoding