Empty expressions fix