Fixing bug which prevented proper communication