fix alarm ordering