fix dodgy merge in aca299e02b58d76b7e69a4729a7