Ensure component expiry date is assigned correctly #241

see #241