fix hardcoded stuff