fixed core erros