Fixed duplicate entry points