One last fix after review