Expression Interpreter updated with #491 fix.

Updated version of Expression Interpreter with #491 fix.