Fix problem where legacy clients will end up failing - jorj