Format fixing