Fixed a bug where a falsy value would not get returned