Fixed closing conditions