Fix before release