Improved Critical issue