Temporary fix for socket crash