fix errors by mariscal