Fix issue where signs and numbers were not picked up