Fixing entrypoint