Silly infinite loop removed