Fixs Loop and decision reconnection
Merges with master