Fixing the OverWrite

In earlier commit some statements were overwritten by mistake