fixed endpoint clash