hardcode fix