Fixed client id problem from WasteHandler.