Fixed bug where numeric check wasn't catching everything