Fix hardcoding