Fixed duplicated code resulting in double npcs