fixed major bug on entrypoint