Service mode working again