Bug fix on the EntryPoint file