Fixed expression bugs