Clients/Gibson critical bugfix