Fix for NSE_38362