fixing of errors