Fix loop back issue by @seanrand