Entrypoint fix