Revert "Code Fix"

This reverts commit df6b6c4e3d2f4575007451d2756e8c2d3fc0be25.