Fixed Communication issues