Potential bugfix: empty string != undefined