Fix for Either endpoints