Fixing bug due to length extension.