Fix bug in Controller/join