Fixed for GNL 3.4