fixed for legacy endpoint