Fix for #17 (Infinite Disco States)

see #18 I got the branches correct this time.