correctly check padding
remove unnessiary &
0.6.1