Fix for Client 8.5