Fixed issue with this pointer breaking expressions.