Fixed presence / absence handling.