correction bugs v17