New CI version & bug fixing