resolve critical erros
resolve critical erros