I've figured it out!!! 
I didn't understand at the beginning what you meant with columns swapped with rows, but now I do.
My keypad it's configured slightly different.
3 6 9 #
2 5 8 0
1 4 7 *
4 x 3 and I was trying 3 x 4.
After re-map everything went just fine!! =)
Thanks a lot!!