final fix and workaround for addMonitoring, waiting for the patch release