Make void value expression regex less aggressive
Fix bug >.<