Fix critical issue in scorpio core