Latest fix for clientlibraries