Fix for connecting loop