Move new assert to correct location