Fixed protocol once again