Fix compilation bug - cf details in previous post