Added endpoint fix