Fixed infinite loop with electros