fix bug when dealing with numeric from numpad
fix conflicts