Temp. fix for connection bug.