fix ISO compliance