Fixed minor bug of wrong padding match