Added fix for number and operator expressions.