correction bugs v18