Revert "Assertion corrected."

This reverts commit 0beb3eb2ba415c282798a205af554120a62f6495.
Assert corrected and padding also.