FIX: Handle equiv case