Hack Fix for Clients