Updated to reduce FPs, should fix #103