Reverted to non-padding analysis method