Fix issue with iso formating