Fixed messaging bug