Fix an issue with the latest build as proposed by Aric in