more support and remove console.error