Hardcode fix