Fixed issue with CBS swagger