Some fix after first test