fixed some false positives, bigdecimal check