fix after Chris review