Fix WL-2954