#117 - incorrect padding in some blocks