temporary fix for socket hangup #19