Messy way of making expire recoverable when editing/creating component