Added an ugly workaround client connection :D