Made release more robust