Fix "expire" handling when modyfining block