Solve double-closing