Earlier 'fix' was a bit too simplistic