More compliance with LDP spec.