fix issue final code drop