Revert "Corrections bugs"

This reverts commit 36c026b0d1c42b4d505984e2349bea3a11e0dfaf.
Corrrection #1